Merge "hostdex:true modules are available for platform" am: 7cf4b5de am: 880fd78f am: 789ccacd Change-Id: I8891a09d18bf158bd7a209bf7420c40ed5529d43