Merge "Fix jarjar rule for LocalLog" into rvc-dev