Merge "Fix oatdump to use OatHeader pointer size"