Update 240x240 theme

Change-Id: I1a50fa0bb750b229220c217d24253b65f24d2920
Add 320x320 theme and split out watch.xml for square watch layout

Change-Id: I7fe38b20913a981942105637a527a2d26ed035a5
Merge remote branch 'omni/android-4.4' into android-4.4