Separated Android test code from source.

Moved the nested test classes in the android contrib code into a separate test folder.  The unit-test dependencies were making ProGuard sad, causing it to complain about missing libraries.