Merge branch 'stable-2.11'

* stable-2.11:
  Bump plugin API to 2.11.6
  Bump plugin API to 2.10.7

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