Made CommandBuilder public to resolve WinPhone and Android failures.
Added Android tests.