Merge "Add support for ANDROID_RUNTIME_ROOT variable"