am 202eaaf2: Merge "Clean up post-opt passes, perform only those we need."

* commit '202eaaf26ac4ec67fab479e181dbd2507737ff65':
  Clean up post-opt passes, perform only those we need.