[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: d161e765 am: e1d3297e -s ours

am skip reason: Merged-In I0736ecef343834c746464666a454a8bfcd4a20ea with SHA-1 8b481264 is already in history

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



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