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

Change-Id: Ic6e0e08a567cb3659169f59c01a7fae00b91bc94