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

Change-Id: I781927aa4b7e116737dc548e7bbc3ebfa188db67