[automerger skipped] Merge "Move more non-AB code to separate files" into main...

[automerger skipped] Merge "Move more non-AB code to separate files" into main am: a8d60eb0 am: 7ccbbf03 -s ours am: 4aa3f7b0 -s ours

am skip reason: Merged-In I0736ecef343834c746464666a454a8bfcd4a20ea with SHA-1 513b86e5 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2808395



Change-Id: I26a83dd71d3d3ed9bfed38065cba17ec272d2635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>