Modified for Linaro-4.8 building

Change-Id: Ib03ea74a2c0b73db1b7da1ebf5d740cb9e37366a
Modified again

Change-Id: Ided05018588f26bb9b0ff8bc39e619873a91fa74
Another ooops

Change-Id: Iedfdc0504a515a1e7e4074e2dee8c75598f27f84