Merge "Rename ANDROID_RUNTIME_ROOT to ANDROID_ART_ROOT following APEX module name change." am: 80fd44500c am: 59bcfb47fe
am: 22e5747842

Change-Id: I845b92a59bdb32c396320bc008555eaba5f40d05