Merge "Categorize [anon:stack_and_tls:{}] as stack memory" into stage-aosp-master am: 4657a1648c
am: 6c05510d86

Change-Id: Ibe8bb89f39082f73f3a4e7bdcf34ebdf5dc2f2b6