Manually merge commit '1e99901' into nyc-mr1-dev-plus-aosp

* commit '1e99901':
  Installer: Support delete_odex command