Merge "Remove custom android_test.jar disting"