Merge changes Ia4ed05ba,I7b04b546,I4436cb1a,Ifeb61e24,I8005e6fa, ...

* changes:
  [AWARE] Add NAN data-path HAL function pointers
  [AWARE] Fix the Nan register handler command
  Wifihal: Fix service instance id from u16 to u32
  WifiHal: Add max queued transmit followup msgs
  WifiHal: Enable TransmitFollowup Indication
  WifiHal: Fix the APIs as per prototype
tree: 0f8f600ada014065c87aa32703b736a7130845de
  1. qcwcn/
  2. Android.mk