heif: use width and height for decoder -- DO NOT MERGE am: 49d4aa0a74  -s ours
am: 96fa7ff5c4

Change-Id: I4cb96709a4c25e12881a9341aa60e66ccadef9ee