Merge "Fix dump-oat-boot to work with new build location by supplying explict host-prefix"