Merge "Fix and re-enable compiler_driver_test" am: 0fb09f7 am: 7acef76
am: 4aa243f

* commit '4aa243f826cd0631a5703c5c4bbb11b38140ee23':
  Fix and re-enable compiler_driver_test

Change-Id: Ie34fcabf8b54154eb67cd5fb4b1afa7f13697c87