Merge "adb: remove extraneous stat in sync_recv." am: e69e9be7b6
am: f7d0ac101c

Change-Id: I4cb529709456361059217b509c3705dddadf0871