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

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

Change-Id: I741614f9622718161ca991a44036391d72203410