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

Change-Id: Iffe8405af9c671c0808e54288319c31d19072f10