Revert "staging: android: Update from Grouper"

This reverts commit d2f243a44ba25b5b74421217165efc9326c99a11.