Merge pull request #2321 from asmorkalov:android_run_all_tests