Clean up includes

Remove unused include, and move other includes to the .cpp file
that needs them, from the .h file that doesn't.

Test: build
Change-Id: I2a3746a23c60e164665cb70e59f8146ca0660cef
2 files changed
tree: 74e54c1af2df048e1ab81ef9bcc1b54ec22135a4
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS