Merge "Remove obsolete helpers from CompilerDriver." am: 4a77b1e967
am: 9ca9e4b2c1

Change-Id: I272fa1ed8d047d436057f9f4b31f5d5ba9b3ce5c