Merge "Remove bp2build from frameworks/base/api/" into main