Lint errors:
Removed classes we no longer have.
Added a targetSdkVersion