Merge "add PN54x chip selection" am: 8c3bbf44cb am: f644e0182e am: 761cf10d8a
am: 5a5a4e274b

Change-Id: Ia12a7e6bd7d1de6b983f4f8c7f82d7b330f548aa