Merge "Remove unused Bouncycastle files" am: ab590bc300
am: 018d0a69e3

Change-Id: I207e94aafba91810a69d74f2565de5d3db8ba9f2