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

* commit '7acef76ca2bc6a2b64a7059097b15f8ef7b0ff7e':
  Fix and re-enable compiler_driver_test

Change-Id: I570566b14ebba9f799029841c4780148d2f87486