Merge "libbinder: disable disabled tidy warnings"