fix frameworks, problem start
Merge branch 'cm-11.0' of https://github.com/imercm/android_frameworks_base into cm-11.0