[automerger skipped] Merge "Hack around wifi_legacy_hal.h transitive include bug."
am: fdcdeb2a3a  -s ours

Change-Id: I1e47fa9072eeeafd4a0efe8aa7403998a4780cc6