Merge "Inline framework-private imports used in support lib tests" into nyc-dev