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

Change-Id: I79c99813b0909f6e722a3aaa6cb35289a96b8ac0