Minor lint cleanup

Clean up a few lint warnings and deprecations much older than the minimum Android version.