Fix Android lint warnings