Merge changes from topic 'qc_api_drop'

* changes:
  WifiHal: Fix NdpInitiatorRequest error code
  WifiHal: Configure Discovery indications
tree: 6e5dd6dd8cacc62fec34fda321d119b14aad9f5e
  1. qcwcn/
  2. Android.mk