Merge "Revert "Define release flags in starlark instead of make"" am: 2f1f4c25f7 am: f54a552cc5 am: 87d0ddc115 am: a5ab48113a am: 6a70de644b

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

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