Android lint cleanup