Bring in more Linaro

Change-Id: I4cfd1d84fa240b1794db6eb916d35b3dfbca004a