Android 6.0.1 Release 47 (MMB30K)
Merge "Remove HAVE_UNWIND_CONTEXT_STRUCT."