merge branch android-4.4 in to cm-11.0