merge outstanding changes from 2009

see: https://github.com/abstrakraft/android_build/compare/CyanogenMod:cm-11.0...abstrakraft:master