build optimisation

Change-Id: Ibec693a244c11922bf6d060479daa38af8b852b8