Track image sizes separately from image files. am: d81e1256f2
am: 2b7a0afd32

Change-Id: Ic737a6c7a72923b0aef210b0b9d4da2cfdff20d4