Changes for new Android Lint.