Merge "ART: Change GetAndroidRoot() handling"
am: 6b801024b0

Change-Id: I2ce35874e7ca67f8b027f925bdf3efca38e44f67