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

Change-Id: I15c9401f500ca32f9d3d27d4920527bf9aa5d9bc