Merge changes I22755f38,Id3462218

* changes:
  Fix the layoutlib_bridge .classpath to not use the full layoutlib
  Move layoutlib typeface implementation to delegate.