Merge "Adds 2 new option args to oatdump:"