Merge branch 'stable-2.11' * stable-2.11: Build with API version 2.11.5 Build with API version 2.10.7 Build with API version 2.9.4 Merge made by the 'ours' strategy to avoid conflicts. Change-Id: I12a4d3a07d8ba3cbcf0529497b8bd49401071fb8