Merge "tests: clean up bionic-unit-tests-static linking"