Merge branch stable-2.13 * stable-2.13: Build with API version 2.13 Change-Id: I681fd49d49e9fb8d83723d63839b7c77fcd25f3f