Merge "Add ANDROID_RUNTIME_ROOT environment variable"
am: 87aa446d48

Change-Id: I6a386cec7058660899cf75b198f01264b9af97de