Update to framework trunk
Dependency update and code configuration removal to reflect incompatible changes in tangram
Dependency update and code configuration removal to reflect incompatible changes in tangram