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

Change-Id: I34995899acb1af24a7b2a177fdc25c820089d46f