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

(cherry picked from commit 780b11e07d38ca06507897746720d835ef5a99c9)