Merge "Remove leftover support for target-as-host" am: b9cd9cf51b am: dfe4a19f7e am: 760dea934d

Change-Id: Id783a994dd1b01bbe3d5cab9a03d70b965cec94f