Merge "Add 'dist' to gtest targets to avoid jack issues."
am: 5a2bb55f47

Change-Id: Ic1ccf595189a9771c290199e0ebcc48d46bbadbc