Merge "Convert wificond to Android.bp" am: 69da09ec61
am: 6cb28b248d

Change-Id: I8951594ede4ad9caaed1c1ef479aa16d60f42aa6