Merge "Add new static library dependencies for bionic-unit-tests-cts"