Use 4.6 Toolchain again

Change-Id: I2c10b9e556ada8c389b0087082ea7a25ffffc063