Trebuchet Update - CM-10.1-M3

Commits bring Trebuchet up to date with CyanogenMod's M3 build.

Successfully built and tested with no issues, if somebody else can please test to confirm there are no issues.