Merge "Add "testng" in classpath, and "--core-library" in LOCAL_DX_FLAGS for "CtsLibcoreOjTestCases""