Merge branch 'stable-2.11' into stable-2.12 * stable-2.11: Build against API version 2.11.10 Build against API version 2.10.7 Build with API version 2.9.3 Change-Id: I4a40185023908044c1c380da970234f46a500e7e