Merge with all dependecies from cyanogenmod

* also cleanup