[automerger skipped] Merge "Categorize [anon:stack_and_tls:{}] as stack memory"
am: bf60c29c7a -s ours
am skip reason: change_id Id929671d6c52ba92b4ea11c83297f3af3ced89e4 with SHA1 4031383e22 is in history

Change-Id: I237d92a8cb5a4b80263cac3f5d2ac7d1e76e8af3