Minor Android Lint Cleanup