Fix host_bcp.sh after output layout changes. am: 7107e8c397
am: 3bee8c9362

Change-Id: Id6586f580c188338fb2ef83be9011f15160cb8b8