Merge "Support lib-blocklist and whole-static-libs." into main