Android wear 5.1.1 release 1
Merge remote-tracking branch 'strace/master' into HEAD

Change-Id: I71324955ac973323aa790485c240e553272ff266