Merge "Fix and re-enable compiler_driver_test" into nyc-dev
am: 96d4ff8

* commit '96d4ff8d96da8949c98691953f4961fb9fd8f0d1':
  Fix and re-enable compiler_driver_test

Change-Id: I97780950b5943cbdc5e0ffca88802d1b08f48628