Merge "Add hostdex support for soong"