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

Change-Id: I2f07e5a80808e4fb21376572a032fa090f28a908