Merge "bionic: Add shadow call stack guard region field to pthread_internal_t." am: b87e85aac3
am: 993f5338fa

Change-Id: I6b411ab9e7a1792f970f065e32275708f3678e15