Merge with all dependecies from CyanogenMod/cm-12.0