Clean up post-opt passes, perform only those we need.

Change-Id: If802074d780d91151d236ef52236b6f33ca47258
Merge "Clean up post-opt passes, perform only those we need."