[automerger skipped] Merge "ART: Fix oat_writer_test." into pi-dev
am: 354794b1c5  -s ours

Change-Id: I739b626e270ecb30d1db88209ea0c174c6ccfd40