[automerger skipped] Improvements to host-side tools
am: f586eedb67  -s ours

Change-Id: Iac497c1d671ac8ebf191ae55326301e9467931d5