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

Change-Id: I530d2d18fea429fd6b210eae187da800666042de