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

Change-Id: I7c27a3e86de73becb06bb5a1fbc5231dbccb425f