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

Change-Id: Ieaad8091e4988745da71dc806c29cf8d07b5c5b6