Restoring two more bouncycastle classes for compatibility

Bug: 3086427
Change-Id: I7500d43f11630fdf52b70001f110400bcee6c2e1
3 files changed