Merge "Remove unused reference to gtest_prod." am: 3804f8a566

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1682073

Change-Id: I5533210fcb06d9e8cd0e08c03a2b14a9adae8010