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

Change-Id: I691ff163fa10c442c1750bbb60b75123cb2f13af