Add missing headers needed for Android userspace

Change-Id: I920b8ef9388d720b91b2501d0a1fde0dc4f32460