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

Change-Id: I7e6a7e47fe5a39089ff70a60d407b79ca642671f