Merge "Move Bionic slots to the end of pthread_internal_t" am: 2bfe37afc8
am: 2c2fa54afd

Change-Id: Id41043434cbcd0c783075b719b6b116150f01031