Merge "Add android.test.legacy.jar to SDK build"