Merge "Convert external/nist-pkits to Android.bp"
am: 52f06974b0

Change-Id: Ibf13c0d1cc86c81f8423617bb9568553271d67fe