Merge "Convert external/nist-pkits to Android.bp"