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

Change-Id: Id5cf344060734bb2ade3fa1de104b3c023171a80