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

Change-Id: I26054667042d53b4effdb727df2405817ede85b6