Merge "Remove some dex analysis from oatdump" am: 43efe77ff3
am: 931a33e8e4

Change-Id: Ie00bac1de0f142831b2195603e85d4f0883cd046