Merge "Add 'dist' to gtest targets to avoid jack issues."