MFC r255174:
Add missing opt_* header dependencies.
Merge remote-tracking branch 'upstream-github/stable/9' into stable/9