cm's calc & mms back

Change-Id: Ifc26befa0c7665c4ec9151e18265b4ae11ac2e6d
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/manifest into jellybean
Merge remote-tracking branch 'upstream/jellybean' into jellybean