Merge "[automerger skipped] Merge "Categorize [anon:stack_and_tls:{}] as stack...

Merge "[automerger skipped] Merge "Categorize [anon:stack_and_tls:{}] as stack memory" am: bf60c29c -s ours am: 4ab0b963 -s ours am: fc88763d -s ours am: 3e9fb405 -s ours
am: f63e0549 -s ours
am skip reason: change_id Id929671d6c52ba92b4ea11c83297f3af3ced89e4 with SHA1 2a632a38 is in history

Change-Id: Ifdfb7a4e7b78613156a96e6946565d0e92e01a2d