Follow our own g2 kernel

1) fix 803 build

Change-Id: I15e8f9a211dad232187e6b4daddc298361944b7f