Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Avoid frequently operation on btwrite
  Revert upio changes to fix wear timeouts.
  Fix btwrite timer timeout for Angler (1/2)

Change-Id: I6a2ba3d1fa87b5bfc056e1777279c64faefb0b47