Updates for CM12

Change-Id: Ib1045b39c5bc88d5081372e6803cfa784e6795d1
Remove NFC_HAL_SUFFIX

The new default works now

Change-Id: I07b65e5034d5f246fd39f92fd097b8fcb12c7f3c
camera: Move the focus state set

Doing this on preview isn't enough. Solve the race condition by
cancelling ongoing focus messages if a new one is requested

Change-Id: I0c2268d44f18056fea0263c0a420c67eac106db6