Merge "Add BouncyCastle to adt-base."