releasetools: Merge two identical conditional branches.

The merged two branches have become identical since commit
fc3422ad (landed into Nougat).

Test: Get identical incremental packages w/ and w/o the CL.
Change-Id: Id1183f8ed83f684a0dac1a4af87b6e075b08aabc