Merge with all dependecies from cyanogenmod