Merge branch 'stable-3.0'

* stable-3.0:
  Bump Bazel version to 2.2.0

Adapt to project cache returning Optional in latest master. Switch to
snapshot API so this builds again.

Change-Id: I0d41d29035384fa6f5d025728f1d8e1f2b602949