Merge "Convert CtsSecurityBulletinHostTestCases to JUnit4" into oc-dev