Merge branch stable-2.11 * stable-2.11: Add in-tree buck build Change-Id: I09bb395259fd1f7d15d9d31080d5d62afb4b2b20