Revert to linaro 4.9

Change-Id: Ia494ba730d2fff8e32b0f7c74bf65759bfff7d37