Merge tag '2.0.0'

The current version is 2.0.0. But the upgrade (and the previous upgrade to 1.5.3) are done by tarball. This change makes git history correct.

There's no real change to the code.

Test: build
Change-Id: I71144de675626d56b327ea25c6e02256998d2a64