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

(cherry picked from commit 943781d86f2894ddcf9c7a881d7f478df921570f)