Merge "Fix a typo in an error message of dexopt." am: 5f05746eb1
am: 6095b96721

Change-Id: Ia72d39a8ac6b0f8be10add7b5d05d784704daecc