Merge changes I1d03564f,I883e4e6c

* changes:
  adb: be more permissive in test_push_error_reporting.
  adb: make sure that file mode macros match linux.