Merge "Split the rules to build the odex file"