Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into...

Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main am: 821ab221 am: 65793a4a

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



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