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

Change-Id: I2218bc4943a344e66bb7bad7c1ea8ea6386ffa7d