[automerger skipped] Merge "Open image files in binary mode" into qt-dev
am: 0294313ad9 -s ours
am skip reason: change_id I64370af44a050bafea60ff1b0b2be18cc531480a with SHA1 1a6f6feff4 is in history

Change-Id: I5d2ab07717e76584820c6e6a30377e65925fee0c