this needs some fixes for linaro

Change-Id: I410ec983b4529e1116963594d733fec1ef9b95c9