Merge "Add ANDROID_RUNTIME_ROOT environment variable" am: 87aa446d48 am: 8417fced93
am: 9fc9204dc3

Change-Id: I3e6c53f17968b32badf255f40c496ddee2089bb7