Merge changes from topics "AddLibaudiofoundation", "stdContainers"
am: befb3665f1

Change-Id: I9cb2f7d2ba8d41f35800fa0d1684a3c1918b33c5