Android X2: refactor and warnings
Android X2: more refactoring