Android Wear O Preview 4
Merge "Prepare for removal of legacy-test from default targets" am: 96360a5935 am: 043c5d763b
am: 9b345b5991

Change-Id: I00e5624f3f400b9f5563c5fb8167bb4ecc5bfb81