Merge "Fix ojluni testng.xml" am: 4f1cd79eb9 am: 2d6759279e
am: 611dc09b8f

Change-Id: I231452f53666541d8fcc26fa418f01f9b673c901