Merge "Add hostdex support for soong" am: 9f588bcd15
am: a0dd1e08f2

Change-Id: I4c2eab91609f61101e0ad88ee92a3fdb83193a42