Simplified code when using @custom-browser Cucumber tag

Also bumped patch version to 0.2.5 and released the new version of the
gem.

Bug: 61458
Change-Id: I52be5adc386d84f44ffae2a96f1ea73b28b4d946