Bump to 10.1.1

Change-Id: I90ca4d43e27b19e5e535358eaddd95c46fa6ff27
Bump to 10.1.2

Change-Id: Ib2126c5449d4d03ce4f1ac4b3ea84187e944a7f7
Merge commit '3b741ab9040f9079a44850cd5d9bf319056ce0b8' into cm-10.1
Revert "Merge commit '3b741ab9040f9079a44850cd5d9bf319056ce0b8' into cm-10.1"

This reverts commit aa94768173cd8dd464704ca7821f912c68ee648a, reversing
changes made to ea45ff190ce0cb3b29ed5e8877e3823ed8c42172.