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

Change-Id: I200fefa85d8877bfbf86860494468b92f1621957