test: some more 3.1 code to test
staging: android: merge new android code from 3.1