Merge 734514b4214bbdf3609a2d968c66783dec53637e on remote branch

Change-Id: I1331cd181aadf2cf9ac5abb7b3397b47debc8d8c
tree: 127d059cd8af9e90a5e6b11718835bbfae9d6150
  1. android/
  2. com/
  3. nxp-nfc-gsma/
  4. Android.mk
  5. com.nxp.nfc.nq.xml