Merge "Revert "Define vendor-hwasan-snapshot target""