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

Change-Id: Id783a994dd1b01bbe3d5cab9a03d70b965cec94f