Revert "more tracking changes"

This reverts commit 0dd4b614e1cae228ce09fa8c9494ec214ac62d36.
Revert "Adjust tracking"

This reverts commit 480fad8f3e3a79398a4dc3ca5f3ac20b52d19861.
Revert "Android gitignore"

This reverts commit e5ccf3e800b229232ca190e23ceeafc3d1f980ff.