Merge "Remove some dependencies on framework libraries"