Merge branch 'upstream-master'

Initial downstream of testng code (tag 6.9.10)
from https://github.com/cbeust/testng

Bug: 27552463
Change-Id: Ia72763ed396d2f3ac3bc2bc66fb3e383818e1c82