Merge 1cfed31ac7ceecdb6be652921e5cdff84da23c22 on remote branch

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