am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"

* commit 'f8b804f8c532c6d913d8389f9a8e4c05a8f0310c':
  Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true