Android 6.0.1 release 4
Merge "Remove HAVE_UNWIND_CONTEXT_STRUCT."