Merge branch 'LA.BR.1.3.4_rb1.1' of git://codeaurora.org/platform/packages/apps/Nfc into marshmallow-caf