Merge "Make NfcAdapter states public and fix build."