Merge changes from topic "libmeminfo" am: 75e6ec7056
am: 372bffe0cc

Change-Id: I5b7b7b7f37965c4dceb7ac8370bc073e3db32fcf