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

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