Merge "Fix dump-oat-core-*"