Merge "Add aosp_barbet_hwasan" into main