Android tests

Continue to clean up test suite for Android common library.