Do not use wrapper for compiler

Change-Id: I2acbd81f48b3e18b4cfbe6f7e4f6beb32e884cc3