Merge "No need to pass shared library infos explicitly in performDexOpt." am: a838467fb4
am: 3d5e81fc62

Change-Id: I83b10be058656ab0890df5d99141c75ce73a1716