Merge "ART: Clean up dex2oats/oatdumps Android.bp modules"
am: c06bfc9b18

Change-Id: Id6b8afdf90ba7fa8430f6bf6798c02cfc6890c2a