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

Change-Id: Ib78e1923b5dea5e4f9fb2dde04d76298f76bd131