Revert "Fix App Indexing build"
Revert "Fix App Indexing build"

This reverts commit 89461c8406e74536aa3face4dfa06ce1733f52ff.

firebase/quickstart-android,hbmartin/sub9-client,samtstern/quickstart-android,firebase/quickstart-android,AJHill37/LFG,firebase/quickstart-android,samtstern/quickstart-android,hbmartin/sub9-client,AJHill37/LFG,samtstern/quickstart-android,firebase/quickstart-android,firebase/quickstart-android,AJHill37/LFG,firebase/quickstart-android