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

Change I632d1032 should take care of the fatal error.

This reverts commit ca2bb3b5202595b2b2ec604f57977efff3ca1f61.

Change-Id: I29a9b6afee45c100deb2124f138ccf9f84e3edb9