Merge "Ignore the optimized location passed to DexFile.loadDex()" am: 2a9dc4dcc5 am: 90a9c1d00a am: 93f8b836f3
am: 3c0f9e3595

Change-Id: Idfaf073fdbb8396d235962ebfe1eb1c06e7e89c6