Merge "Make ANDROID_RUNTIME_ROOT a required env variable"