Bug: 79855166 Test: m continuous_native_tests dist Change-Id: Ie9ae55b694f6d3b6bab6695b23eb83ed2571a692 Merged-In: Ie9ae55b694f6d3b6bab6695b23eb83ed2571a692 (cherry picked from commit b376c033)