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

(cherry picked from commit a9dff3409b3bceadf4119277f62a8367490fa372)