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

Change-Id: If3c46092837e98de9aa134156f7b48647550b4db