Merge branch 'stable-2.12' * stable-2.12: Build with API version 2.12 Change-Id: Ia60b0ed07728edc6bb99974e5c4cd9bb0f9ed844