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

Change-Id: I7d47cd696af78d6061766fdebdc8cbc0f16d3a89