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

Change-Id: I47ccd8953c4f1dd783325de612e3074322df7559