Merge "Update WatchFace project to remove old watch faces that are no longer...
Merge "Update WatchFace project to remove old watch faces that are no longer good practice and change structure to make sample clearer." into nyc-mr1-dev am: af512140 am: 554fe63c
am: 4bd15eaf
Change-Id: I3a8bb2c4fc06100ca61c6f8cfbf0bd559ee20c1a