Merge "libgtest_prod: use headers." am: 40bbe789a4 am: 2678fed701

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1685326

Change-Id: I65f256d183629048b91ca9ee6d1d497707511169