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

Change-Id: Ib21d1057b4148e88d27689669f9c58027775ce3a