Merge "Do not generate empty dex in multidex." into lmp-dev