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

Change-Id: I058734e89e3bc430d4f546747ff35a81c3478e00