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

Change-Id: I78acacc81e1d159c1f4107aa936d68adf4ce11f9