Merge "Add missing Dex file dependency for ART gtest oat_writer_test." am: 8e9c11d0 am: c99c062d am: e92432af Change-Id: Id28cc8607d69d62bf3f0163746f84ec019e5932c