Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_frameworks_base into cm-12.0

Change-Id: I452280ecb272df890ffb403301b398950210cd0a