am da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerbread

* commit 'da01b4abb817fcebdf33c27aaa6a1ac4a61beee0':
  Make MifareClassic methods more consistent.