Merge "ART: Sync oat file to disk before patching"