am 1b5a5dc8: Merge "ART: Sync oat file to disk before patching"

* commit '1b5a5dc82b9618d9deef62962954bfb9871a88d1':
  ART: Sync oat file to disk before patching