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