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

* commit 'acb64e8e1139a2b2754307c7530b859bf8fd4b83':
  Fix and re-enable compiler_driver_test

Change-Id: I0dc69b7877eebf2d064e647f8ba66d78ea4e6b93