Improve solve lints of Android Tools