Fix header typo
Merge remote-tracking branch 'aospal/kitkat-staging' into kitkat-staging