Merge 871b5dcf46db3230129ebdb6c8499c1db63a1ec0 on remote branch

Change-Id: Ie30b523cf934d12cad74cd835b2be2c8abb6d963
tree: 0d46ef9aed62f5fadfccbb9ec9b2a4850a9e48a9
  1. fm_hci/
  2. fmapp2/
  3. helium/
  4. jni/
  5. qcom/