update ApkCombiner to support class conflicts