Merge "Have the `art` script honor a pre-set `ANDROID_RUNTIME_ROOT`."
am: 7fe5e39bd3

Change-Id: I0b7bdcb1a006b0c175dadc14a559e74526a4516a