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

Change-Id: I8107d619a3f386bba50c1c1d2946d399ebc24088