Merge to XFA: Cleanup: Make CPDF_Annot::m_pAnnotDict private.