Merge "Revert "Updated the way we build AFL++ fuzz binaries"" am: 85125778

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



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