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

(cherry picked from commit 76961b5ed3aca5c91feb2b44a134a0474df4fd92)