Merge "add OWNERS to junit" am: 2faf8f4ae9
am: 95c268744d

Change-Id: Ib3338ce400ba023b64af2f3c10d9688ac2eaa6f4