Android CTS 6.0 Release 23 (4337277)
Merge "Remove HAVE_UNWIND_CONTEXT_STRUCT."