Android: Fix Lint errors