Merge "Allow modules to be added to ART sdk" am: beead57199

Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1399208

Change-Id: Ifb7b78897f803ad89d30c7638fbd4a45e00d9b30