Merge fb3064ac8f1d21c35f8cb9715545b23d9d036709 on remote branch

Change-Id: Ia49f0ce7e98d0123dc573bff8664cc88a361b322
tree: a327f4ad0c3a092e040d14096b45b175124afbeb
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/