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

Change-Id: I487a3200b4c6d9e8f36aee4f3e744beaf07a95d9