Add missing headers needed for Android userspace

Change-Id: I067cd3a42b70cfbfb8ca8f6033f86d8f91c16a70