Merge "Do not build Clang tools on the platform" am: 2597deda1a
am: b687b32f1f

Change-Id: If3b0d0aab57269b23cf625b3edb66a017434543b