Merge "Update DexFile#getDexOptNeeded usages to reflect API change" am: 515e6443aa  -s ours am: 925a08df7c
am: 1195d66081

Change-Id: I7233cb98339e1e4e47f80e84bb8d35d4605ddaaa