Merge "Fix build breakage in crosshatch_hwasan-userdebug target"