Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caec am:...

Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caec am: a084e1bf am: e1a86fed am: a5cf995b

Original change: https://android-review.googlesource.com/c/platform/build/+/1506496

Change-Id: I69d1891ee38701136155805b9c47637677c0c338