fix builds with 4.8 linaro kernel toolchains

Change-Id: I60c26d82dc941db350e15e6a2fe62b02b846bd08
Merge "fix builds with 4.8 linaro kernel toolchains" into kk4.4