Merge "Part 3 - Updates wear samples for Wear 2.0 launch (fixes minor issues...
Merge "Part 3 - Updates wear samples for Wear 2.0 launch (fixes minor issues too from using latest support library) . am: 39629625 am: 401b2f19 am: 3ff2ada5" into nyc-mr2-dev-plus-aosp