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

Change-Id: I4a097adc67258667910b1e674738287d00ad6779