Merge "Keep dex files in bouncycastle-testdex.jar."