Merge "hostdex:true modules are available for platform"
am: 7cf4b5de6b

Change-Id: Ia8ae86ffef5e2e3015cdfc3832798b54e0379f18