Android 6.0.1 release 13
Merge "Revert "Update to version 2.6.2.""