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

Change-Id: Id9a1f880c212c80ba2a62860261b26c8f87fff0b