Merge "Reassign TLS slot 2 to TLS_SLOT_APP."
am: 3ce06c7b0a

Change-Id: I91031668fe12352c7957b45066e2efb0b0b1e6ba