Merge "Remove unused Bouncycastle files"
am: ab590bc300

Change-Id: I0f30201515b310f2bb0440d2e6c9ac79bb552648