Merge \"Set file capabilities on adb sync/push.\"
am: a500cf9cdf

Change-Id: I07232bd6f7f01daa44a2d8d30efdadce1e6af67c