Fix Linaro build

Change-Id: Icd183261720953a1007dd3ff69aafa592aa89794