Merge branch 'stable-2.11'

* Update API version to 2.11.4

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