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

Change-Id: I0efcfb627ed17e24ffb278909d19292a4ffdb058