Merge "Open image files in binary mode"
am: 744677aaf5

Change-Id: I09e6672afb96324fa94da162a0be1226a1ff4174