Merge "Add genrule for combined-removed-dex"