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

Change-Id: Ib8079a3cc7367db10806da5bab80f402530ce8a7