Merge "Fix typo in comment in android/nfc/tech/Ndef.java"