Merge "Fix oatdump to take bitmap bytes into its accounting." into klp-dev