Revert "Add missing headers needed for Android userspace"

This reverts commit 38ebd8677640ccb8b26ab5a618ef3a72a46e7893.