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

Change-Id: I3eaf0a7ff3a2b2ecc7107507c3c61d68e65fb594