Merge "Merge "Switch get_env_or_die to requireEnv" into rvc-dev am: b1dfb8e575 am: 63b3c143ac" into rvc-d1-dev-plus-aosp am: a4da018b3c
Change-Id: Ifdfa0c39b5b5ae8e279d996e5419965f3da20bac
This commit is contained in: