Merge "Cleaned up after merging multiple cls. Updated support libraries / wear...

Merge "Cleaned up after merging multiple cls. Updated support libraries / wear libraries. Switched LogoText theme to using floats instead of string dimens. Use local resources for images in contacts list." into nyc-mr1-dev am: 702ed2be am: 97ce270b
am: 1e198690

Change-Id: If5e6f36bf69b7bb659376af85f36cc8aa30521c4