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

Change-Id: I07d053928ea05af7acf5bd4cadde26455356fe9a