Fix lint issues

Add minor fixes. Now project can pass standard Android lint rules during build process.