Merge "Updates watchface to use ComplicationDrawable." into nyc-mr1-dev am: 70d09e20 am: fc9a8c5f am: ed2fba8a Change-Id: I370236d013bdf8ca339c3bb0ebc1c096e25c0c01