Merge "Rename ANDROID_RUNTIME_ROOT to ANDROID_ART_ROOT following APEX module name change." am: 0560d0ef6f am: c82fce8c44
am: 250268993b

Change-Id: I9d522fff5f7720de42f4199043d0dd0c29796a3a