Revert "Merge branch 'cm-11.0' of github.com:CyanogenMod/android_build into cm-11.0"

This reverts commit 3a4c81b336436232834c4cdd4a594619da25d74c.