Merge "Fix error found building relocation packer for host bionic" am: 9c172c86 am: fc1684ea am: a5bb6be7 am: 030b8eee Change-Id: I3106c026bafc0d68bcf78317b1e61d028759cc50