Merge "ART: Change GetAndroidRoot() handling"