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

Change-Id: I28189f4d70c6b76e25db5e318855f3512755969e