Merge a689063f61b139e045eef16bf3c0f62fd608fc83 on remote branch

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