[automerger skipped] Merge "Categorize [anon:stack_and_tls:{}] as stack memory" into stage-aosp-master am: 4657a1648c am: 6c05510d86
am: 3b827e107a -s ours
am skip reason: change_id Id929671d6c52ba92b4ea11c83297f3af3ced89e4 with SHA1 2a632a3880 is in history

Change-Id: I1260874cb7380a10fa4f5822bc41f89cd3c51829