Merge "Add "testng" in classpath, and "--core-library" in LOCAL_DX_FLAGS for "CtsLibcoreOjTestCases""
am: 51a7459087

Change-Id: If3da1b3badc171788239685ef77b7de446636039