Fix some mistakes in build.json

aes/internal.h got removed on accident in some reshuffling. All this
also really should be under the bcm target, rather than the crypto
target, but we'll sort that out later.

Also rand_test.cc got duplicated.

Change-Id: If77f1ff6149a764ccf96073166a5520b284b2dc7
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/70768
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/build.json b/build.json
index c1dc1ae..4b80dfd 100644
--- a/build.json
+++ b/build.json
@@ -496,6 +496,7 @@
             "crypto/ec_extra/internal.h",
             "crypto/err/internal.h",
             "crypto/evp/internal.h",
+            "crypto/fipsmodule/aes/internal.h",
             "crypto/fipsmodule/bcm_interface.h",
             "crypto/fipsmodule/bn/internal.h",
             "crypto/fipsmodule/bn/rsaz_exp.h",
@@ -851,7 +852,6 @@
             "crypto/rand_extra/fork_detect_test.cc",
             "crypto/rand_extra/getentropy_test.cc",
             "crypto/rand_extra/rand_test.cc",
-            "crypto/rand_extra/rand_test.cc",
             "crypto/refcount_test.cc",
             "crypto/rsa_extra/rsa_test.cc",
             "crypto/self_test.cc",
diff --git a/gen/sources.bzl b/gen/sources.bzl
index dcb7776..e1b2360 100644
--- a/gen/sources.bzl
+++ b/gen/sources.bzl
@@ -599,6 +599,7 @@
     "crypto/ec_extra/internal.h",
     "crypto/err/internal.h",
     "crypto/evp/internal.h",
+    "crypto/fipsmodule/aes/internal.h",
     "crypto/fipsmodule/bcm_interface.h",
     "crypto/fipsmodule/bn/internal.h",
     "crypto/fipsmodule/bn/rsaz_exp.h",
@@ -745,7 +746,6 @@
     "crypto/rand_extra/fork_detect_test.cc",
     "crypto/rand_extra/getentropy_test.cc",
     "crypto/rand_extra/rand_test.cc",
-    "crypto/rand_extra/rand_test.cc",
     "crypto/refcount_test.cc",
     "crypto/rsa_extra/rsa_test.cc",
     "crypto/self_test.cc",
diff --git a/gen/sources.cmake b/gen/sources.cmake
index 5d73071..eb22684 100644
--- a/gen/sources.cmake
+++ b/gen/sources.cmake
@@ -617,6 +617,7 @@
   crypto/ec_extra/internal.h
   crypto/err/internal.h
   crypto/evp/internal.h
+  crypto/fipsmodule/aes/internal.h
   crypto/fipsmodule/bcm_interface.h
   crypto/fipsmodule/bn/internal.h
   crypto/fipsmodule/bn/rsaz_exp.h
@@ -769,7 +770,6 @@
   crypto/rand_extra/fork_detect_test.cc
   crypto/rand_extra/getentropy_test.cc
   crypto/rand_extra/rand_test.cc
-  crypto/rand_extra/rand_test.cc
   crypto/refcount_test.cc
   crypto/rsa_extra/rsa_test.cc
   crypto/self_test.cc
diff --git a/gen/sources.gni b/gen/sources.gni
index 19601f8..71fdeba 100644
--- a/gen/sources.gni
+++ b/gen/sources.gni
@@ -599,6 +599,7 @@
   "crypto/ec_extra/internal.h",
   "crypto/err/internal.h",
   "crypto/evp/internal.h",
+  "crypto/fipsmodule/aes/internal.h",
   "crypto/fipsmodule/bcm_interface.h",
   "crypto/fipsmodule/bn/internal.h",
   "crypto/fipsmodule/bn/rsaz_exp.h",
@@ -745,7 +746,6 @@
   "crypto/rand_extra/fork_detect_test.cc",
   "crypto/rand_extra/getentropy_test.cc",
   "crypto/rand_extra/rand_test.cc",
-  "crypto/rand_extra/rand_test.cc",
   "crypto/refcount_test.cc",
   "crypto/rsa_extra/rsa_test.cc",
   "crypto/self_test.cc",
diff --git a/gen/sources.json b/gen/sources.json
index 1870ecc..1e17762 100644
--- a/gen/sources.json
+++ b/gen/sources.json
@@ -581,6 +581,7 @@
       "crypto/ec_extra/internal.h",
       "crypto/err/internal.h",
       "crypto/evp/internal.h",
+      "crypto/fipsmodule/aes/internal.h",
       "crypto/fipsmodule/bcm_interface.h",
       "crypto/fipsmodule/bn/internal.h",
       "crypto/fipsmodule/bn/rsaz_exp.h",
@@ -726,7 +727,6 @@
       "crypto/rand_extra/fork_detect_test.cc",
       "crypto/rand_extra/getentropy_test.cc",
       "crypto/rand_extra/rand_test.cc",
-      "crypto/rand_extra/rand_test.cc",
       "crypto/refcount_test.cc",
       "crypto/rsa_extra/rsa_test.cc",
       "crypto/self_test.cc",