Merge "Make MifareClassic methods more consistent." into gingerbread