Merge "Fix accounting for .vdex in dumpsys meminfo" am: 4a5789b9b1
am: bb08c03048

Change-Id: I24dc9ea087f76ebb2130a4d4957f0600e189aed3