Post-uapi cleanup.

We can just use the uapi headers now.

(This is probably true for most of these header files, but I just want
to undo the changes we made during the uapi transition.)

Change-Id: I4ab0c6f782f73699595a2ce24809a2c0187c98f8
1 file changed