Merge "Remove custom install rules for tradefed-contrib"