Merge "Revert "Add missing dependency required for ahat-test.""