Merge branch 'stable-2.11'

* stable-2.11:
  Build with API version 2.11.7
  Fix retrieval of path from URL

Change-Id: If2b80affc142828ac3fb6f691f01735341e2ed33
Signed-off-by: Edwin Kempin <ekempin@google.com>