am a948e644: am 00712bec: am 96647a68: Merge "libcutils: fs_config must use O_BINARY"

* commit 'a948e644f89e49c505f4d8bf13c70e49ba6cc56a':
  libcutils: fs_config must use O_BINARY