Merge \"Fix dex file leak in oat file manager\" into nyc-dev
am: 28ea938d90

Change-Id: Icd02f322782eefaac6559425ddec5989ed13a2c2