Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_build into cm-12.0
Merge branch 'cm-12.0' of ssh://review.cas-online.nl:29418/android-legacy/android_build into cm-12.0