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

This reverts commit 629d0d297945eaa11327879d4408167d7fa5db48.