Merge "ART: Fix soong defaults order" am: 1dfa89847a
am: 1c44978b57

Change-Id: I5106160517bce0458b5fb71b61d4f61463ac7b02