[automerger skipped] Merge "Categorize [anon:stack_and_tls:{}] as stack memory" am: bf60c29c7a -s ours am: 4ab0b96391 -s ours am: fc88763df7 -s ours am: 3e9fb40514 -s ours
am: 10ff99c71c -s ours
am skip reason: change_id Id929671d6c52ba92b4ea11c83297f3af3ced89e4 with SHA1 2a632a3880 is in history

Change-Id: Id603d94c30dbb489d2a65de71208405d9141eeb5