staging: android: Update from Grouper