Merge changes from topic "libmeminfo"
am: 75e6ec7056

Change-Id: Idc7ba38fc45f7dda479f76a8b3015b8123de748d