Bug: 78286518 Test: make -j48 continuous_native_tests dist Change-Id: I9769a286d81ce53fa6adecaa3fa62c741c536bdf (cherry picked from commit 1b74dd3a)