Merge "Re-enable in-process unwind test."
am: 1f541bf57d

Change-Id: Iefb63561bdc17265cfbac770ced32cb8bc232eed