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

Change-Id: Ib87b5eaffd36e9e7ff6faafd5682ff34df5a4107