Merge "Test links libbase statically" into android12-tests-dev