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

[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 skip reason: change_id Id929671d6c52ba92b4ea11c83297f3af3ced89e4 with SHA1 4031383e is in history

Change-Id: I5b05dc4234d0cbe450e7086362cae67908f514da