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: I60d29156ab9e51235255ba86f60fce7bb11b439c