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

Change-Id: I361d1eb50e543671d47be08671ef69efb78b6ed9