Merge branch 'stable-2.12'

* stable-2.12:
  Build with API version 2.12

Change-Id: Ia5e685a9723dba4460a73972ca0a513f7836f3d6