Merge "Support both proprietary and common implementation for Mifare tag reading" am: 5feacd98 am: f7c2d343 am: dccd5fda Change-Id: I7726e90000d9be93b0b9a94d578be5eb77bdabdb