Add missing #includes. am: a4320f65b5

Original change: https://android-review.googlesource.com/c/platform/system/libvintf/+/3460004

Change-Id: Ib5e6d1541cf07e1a1950640fe82a10b1ecf99849
Signed-off-by: Automerger Merge Worker <[email protected]>