more pn544 hearder cleanup

Change-Id: I7bfc9e84b5da9f70a9c4ce3f0fc14f4b6ca3a1fd