[automerger skipped] Merge "Do not re-export _Unwind_XXX symbols." am: 41eed99d
am: e0728ccb -s ours
am skip reason: change_id I79673753bb8197041bfe8ffb016d9f5fdf4cada5 with SHA1 cf788674 is in history
Change-Id: I5139f587c1d547699d833daa9e3a966cf1aa75a7