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

Change-Id: I3e50c0e6a80bc221228dd8293ec8209ecf323123