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