Merge "Fix include-what-you-use problem in android-pubkey.c."