Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread