Merge to XFA: Tighten up DEPS include rules.