am 5e4cfe79: am 6b417ac6: Merge "Do not generate empty dex in multidex."

* commit '5e4cfe79e11821405b7640e8f60ed631b80255ad':
  Do not generate empty dex in multidex.