Revert "Fix defines redifintion in angle_common." This reverts commit 9fb8ff63e1593dc5553d8f3015ff2d7420c8140d. Reason for revert: Chromium android-binary-size build failed. Original change's description: > Fix defines redifintion in angle_common. > > Breaks in android rolls where we have both > angle_expose_non_conformant_extensions_and_versions > and > angle_enable_vulkan > > Bug: angleproject:7829 > Change-Id: Iaa163b34e01a31a6872f1158064f685ca6fec958 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4111968 > Reviewed-by: mohan maiya <m.maiya@samsung.com> > Commit-Queue: Roman Lavrov <romanl@google.com> Bug: angleproject:7901 Bug: angleproject:7829 Change-Id: Ic431a61403b57d195ace3cc07df756a277f6efdf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4113576 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: mohan maiya <m.maiya@samsung.com>