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

Change-Id: If2052b2f998e726145383731fafe1153e07ccd86