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

Change-Id: I86d06515ffd6a7f695ca24e915cf0ea799799290