am 878445a7: Merge "Do not generate empty dex in multidex." into lmp-dev

* commit '878445a703152fb52e92c159034b738582de9aee':
  Do not generate empty dex in multidex.