Modified for Linaro building

Change-Id: Ib4462be0d1e8639b41216266da1c34b330ef7b91