Merge "Support NXP PN551 NFC controller" am: 45f3ed1213 am: 511e5c8030
am: acd6b4e2b0

Change-Id: I9cd1b22ff609fd10bcbe742c327bc13729afd4b3