Merge "Remove additional prefix for unwind symbols"