Merge "Fix and re-enable compiler_driver_test" into nyc-dev