Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread