linaro patches
Fix build error with linaro

Change-Id: I42192366d5f1d4c9b984f5d5d5545669141c67a0