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

Change-Id: Ibe7ad7b0e08e5c52b61339bd0c4e5661ef44be31