Merge "Add android.hardware.nfc@1.2"