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

Change-Id: Iebc2f4a8769f2f2da5459862cb2d6370dd105c83