Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Don't free memory that shouldn't be freed.
  Fix 256-bit Thinfilm NFC barcode.
  Use global all-cpp-files-under
  Fix fail to write RF parameters

Change-Id: I80e4f6ec1a713650c249af6ab1d93737bdf2c87c