Merge "Make oatdump see the new vmap table generated by dextodex."