Merge "lmkd: Fix meminfo logs missing SwapTotal and having wrong field order" am: eedd5f6855
am: 318e33a401

Change-Id: I229f6f19e3f7a29793484dc53d2ae5c6af5de8f2