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

* commit '6b417ac695f081c9c05f46b7d788be71191c239c':
  Do not generate empty dex in multidex.