Fix the build on 8960

Change-Id: I9b4e17ab838663bf1ba3b4c84f4a81897230870d
Merge branch 'cm' into HEAD