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

* commit '0fb09f7a441a2858c4724198f1ef74d9235be044':
  Fix and re-enable compiler_driver_test

Change-Id: Ie4455edb68b32b13301d2a1d845fe506c4a72784