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