Revert "Use precise ApiMain/ApiQuery type hints in all API modules"

This reverts commit 23632a4ecddd5c6f181807ce776d3be1e1848a71.

Change-Id: Ie4c1e3447eb65c0d29c8be83822d01bc1f1c08fb