Merge "Make ANDROID_RUNTIME_ROOT a required env variable" am: 6dc466fd3a
am: 84cbaf603e

Change-Id: I8fe51f82861ea2397b335efdbc4605fbd1e9b46a