Commit 2c7e9c9 added the basic test suite; these are the only tests that
are now run on Android 2.3 on master. On compat we're keeping full Android 2.3
support for now but the tests and the testswarm basic run mode have been
cherry-picked anyway to reduce the divergence between branches.
(cherry-picked from 2c7e9c9349)
Fixes gh-2505
Closes gh-2509
Refs gh-2483
