Merge "Replace bionic-unit-tests with CtsBionicTestCases"