Merge "Revert "Revert "Add libgtest_prod.""" am: 9bf0192
am: 658729b

* commit '658729bc0290ac05ae59b66bb2eedce3ab99ada2':
  Revert "Revert "Add libgtest_prod.""

Change-Id: Ie98e31acc1b77095f101c08aec01a8ebdb67bafe