Merge branch 'stable-2.11' into stable-2.12 * stable-2.11: Change copyright to AOSP Build with API version 2.11.7 Change-Id: Iba3eea3738b1369f5659c9632b240b207015e214