Moved android_packages_apps_Calculator Upstream