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

Change-Id: I1ab4b961db7d9da210da37bcc3c6201fed36843c