Merge "Revert "Make RuleBuilder methods take Paths""
am: 501d7e594a

Change-Id: Ic43368c3d95a40a53ba1b4ca603106efa82a64c8