BUG: 119665526 Test: lunch sdk_gphone_x86-user make -j emulator wifi should work Change-Id: I217cd89c420c04c5f26d66d15295a37d97c4f475
mentioned in commit 2c1396fd