Merge "Fix dex2oat usage error" am: 1650dafad6
am: b02a79b040

Change-Id: I8eb58b3740afe58e7cba177580597ecd0bcc371b