Separated Android test code from source.
Merge pull request #749 from wehjin/splittests

Separated Android test code from source.