Fix pi-dev-plus-aosp build

Fix files that should have been removed when cherry-picking from
master to pi-dev-plus-aosp.

Bug: 78300023
Test: none
Change-Id: Ic5c1856d1c84432c9d481b6880cbf0a86ed61ebb
Merged-In: I14189558eb7cf143639c8f48e1af253e2e137334
2 files changed