Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"