Merge "testing: Allow adb sync to succeed when vendor is full" am: 773833332e
am: ea6e5db102

Change-Id: If1ca47ce3e5cb2b01f909dd3ca391e55db444f36