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

(cherry picked from commit dbd53b4de7e889a5305b9796a1408efcd2d321c6)