Merge "ART: Fix oat_writer_test." into pi-dev