Merge \"Fix dex file leak in oat file manager\"
am: 9030e9a10f

Change-Id: I7350cd6f2ab708459ef37146e72f13f56478ba09