Merge "Part 2 - Updates wear samples for Wear 2.0 launch (fixes minor issues...
Merge "Part 2 - Updates wear samples for Wear 2.0 launch (fixes minor issues too from using latest support library) . am: a89d0cdb am: 43c7bca4 am: ed8755d0" into nyc-mr2-dev-plus-aosp
am: aab61e1e
Change-Id: I961de68178c81213ad48a4b54c7ba09992121523