Merge "Fix dex2oat usage error"
am: 1650dafad6

Change-Id: I4b5d3ff6ec5533943a9f4d56c0b466ab76fd15d6