Merge "Add missing Dex file dependency for ART gtest oat_writer_test."