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

* commit 'ba430e363427cb99af3afe06baec9360150255b2':
  Fix include-what-you-use problem in android-pubkey.c.

Change-Id: Iec27f1ba8e3c38874e20c377718c76c6885de4f1