Revert "need to depend on puppet-android"

This reverts commit cfb70e7872bd4f80b431c51d3acdcf89745276fa.

The dependency is optional, and causes conflicts. Better to declare it where
you need it