Merge "Use RepackagingTransform and remove custom BouncyCastleTransform"