Clean up bin offset assignment in ImageWriter. am: eaa84415d3
am: 52e1043d9f

Change-Id: Ide03fca6c4a0c28f551f9f4177bf33e378bb6e0d