Bug: 263274255 Test: presubmit; make tidy-build-make_subset Change-Id: Ib6ce849596312f56e8d640c5f78e0e70f7ca54e3