Merge "Add new aidl interface for android.hardware.nfc"