Merge "Add several classes from dx tool to the dexgen project"