Merge "AIDL and java files for NfcAntenna Location Api."