Android CTS 6.0 Release 25 (4485418)
Merge "Remove HAVE_UNWIND_CONTEXT_STRUCT."