Revert "Add an environment to the beginning of catch blocks" am: 37fe26288a am: 21546da349 am: 6c7d7c6b45 am: 571b43a725 am: 85fabcb2bc

Original change: https://android-review.googlesource.com/c/platform/art/+/2207935

Change-Id: Id9bfe432c58417f285994cf91e4f636aca43d24f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>