Fix another build error.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge remote-tracking branch 'PA/kitkat' into kitkat