v22.0.5
build: merge the default.bzl and default2.bzl files (#30953)
build: remove explicit OnPush from dev app