Merge "Remove leftover support for target-as-host" am: 5688181a11 am: dfe4a19f7e

Change-Id: If64300a3e07d504fa9e2ea9c5761a9fcd0d7970d