Merge branch 'ics-release' of github.com:CyanogenMod/android_frameworks_base into ics-release