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

Change-Id: Iab1ad5a0565aec1faf722111a5566b3c104d97fc