Merge "Clean up TLS_SLOT_BIONIC_PREINIT usage a bit" am: 8b14ed45ec
am: fbc1c14de1

Change-Id: If51552250eaa9ad5ff5076bb4f43cb174658b7f7