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

Change-Id: I3d90da151ee6c7616fa9c5e2510fcb9856a1b7ef