Merge "Fix infamous 0d0a bug on Windows by not opening file binary. am: ca223dc3a8 am: 122504d171" into nyc-mr1-dev-plus-aosp