Probam to AOSB

Change-Id: I387e9ad523d8a43fe9bab6d43ec58428d8baba97
Merge github.com:AOSB/android_vendor_cm into HEAD