Merge "Temporarily disable bionic-unit-tests-static" into main