Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  emmc test: fix counter overflow
  64bit emmc fix

Change-Id: I9505f278f80aa1dde754c85a0977255376060cba