[PATCH 0/3] MR10690: android: refactoring and cleanup changes (part of !10569)