Bouncycastle upstream code, version 1.54, plus Android tree for nyc, minus patches
Merge "upstream branch: update Android.mk to N version" into upstream-master