Merge "Add new classes to jarjar file"