update cherry picks
Revert "update cherry picks"

This reverts commit 4a8978d71e0081ac93463732903eb6b798885334.
Merge branch 'cm-10.1' of https://github.com/ctsail/android_build into cm-10.1