Fix Android Lint warnings