Revert "DB markers"

This reverts commit b21b0c1d36bc783ff60bc710437df7ca10ad1206.
Added Android to build