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

(cherry picked from commit d465da95df06bbc494760abde59fb5a315e71302)