Remove an Android hack and support building with uapi headers too.

Change-Id: Id7a809a3f46c2795e3752a913c0acebc59df49aa
2 files changed