Merge "Shift the preprocess mk before build emulator packages" into main am:...

Merge "Shift the preprocess mk before build emulator packages" into main am: 95661308 am: 03468748

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



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