Merge "ART: Save or erase the file even if I/O failed" am: 6656f30
am: 4f4fc1a

* commit '4f4fc1a69a24278009a91144d4a05997b02f3a4c':
  ART: Save or erase the file even if I/O failed

Change-Id: I1d230538f5be74f9eefe38c8d52153e79c9163b3