am d4e119e9: (-s ours) Merge "Revert "Revert "Switch from Calculator to...
am d4e119e9: (-s ours) Merge "Revert "Revert "Switch from Calculator to ExactCalculator""" into mnc-dev-plus-aosp
* commit 'd4e119e9':
Revert "Revert "Switch from Calculator to ExactCalculator""