Bug: 233619860 Bug: 237485063 Test: build pass on both cheetah and aosp_cheetah Signed-off-by: Rex Lin <rexcylin@google.com> Change-Id: Ic759b1efc206a3c1e68526098d258f2c142c6799