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

Change-Id: Id10578ed293f229615ed11c69c634c10af390167