Fix 3.3.0-SNAPSHOT build And fix the build tools to build against 3.3.0-SNAPSHOT. Change-Id: Ibe93bbae60efecb69a579710a2ca9aa89b9d22ff