merge update from CyanogenMod:master