Merge "Remove unnecessary jarjar rule from framework/base"