Merge "Fix accounting for .vdex in dumpsys meminfo"