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

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

Change-Id: I3b97fc7e1cb235a8ae78e3bee59d90ed81f4956b