Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Upgrade bazlets to latest stable-3.0 to build with 3.0.11 API Remove the commented-out snapshot plugin api lines Change-Id: I7fc2ca54b0a2039221f95e162b21630ac6a00e7d