Merge "Convert external/bouncycastle to Android.bp" am: ffde9798cb
am: af1b6933e8

Change-Id: I8529a4da1bdd88bb93844a7a980c65f47ddb25a1