ApiDemos Clean up

- Add missing @Override
- Remove (some) unused imports
- Add some missing headers

BUG: 2031807
23 files changed