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

Change-Id: Ib9d3e3b8c0159d04e28c3501ef214779dc4a1262