[automerger skipped] Merge "Categorize [anon:stack_and_tls:{}] as stack...
[automerger skipped] Merge "Categorize [anon:stack_and_tls:{}] as stack memory" am: bf60c29c -s ours
am: 4ab0b963 -s ours
am skip reason: change_id Id929671d6c52ba92b4ea11c83297f3af3ced89e4 with SHA1 4031383e is in history
Change-Id: I8958b11643b3312e384b923b679eac26d207fe4b