Android 6.0.1 release 12
Merge "Remove HAVE_UNWIND_CONTEXT_STRUCT."