AndroidApp: Fix Android lint warnings