v21.2.10
build: merge the default.bzl and default2.bzl files (#30953)
build: fix strict property initialization errors in dev apps