Merge "Define `ANDROID_RUNTIME_ROOT` as `$ANDROID_ROOT` on target in the `art` script."
am: bbde2e27a4

Change-Id: Ief6ec04f132c7680a11c2c47cdf83f2bdbf8c973