Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Change copyright to AOSP
  Build with API version 2.11.7

Change-Id: I2e93a8814059332f5348096565ebb2cf47860bdf