Merge "Add ANDROID_RUNTIME_ROOT environment variable"