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

This reverts commit bdc0c7615ef3c6cdb617fd72318ddd58dbbafed0.