Follow-up for "Use provided dex filenames in oat file."
am: 69944683c3

Change-Id: Iaedca40cdb7e70f0ce9af4fc5d1ba3df51dc9a24