Revert "Revert "Merge branch 'cm-11.0' of git://github.com/daeiron/android_build.git into pac-4.4""

This reverts commit abcc8139090b173ebab1358b04c46c4ec99437a8.