Merge "A bit of oatdump clean up" am: e453007967
am: 3482cb51dc

Change-Id: I2a3a0ec85d22a6bf84a691c9c4518332e3ebb124