GitLab

This cherry picks the critical parts of enh's original change:
7ee3a061

This is a stopgap fix; eventually when dalvik-dev's changes
are committed to master this should be obsolete.

Change-Id: Ieb04253fb7387ffa37452992c8a5af739fbbc45f