Merge \\\\"Set file capabilities on adb sync/push.\\\\" am: a500cf9cdf am: 4e4a274e96 am: e4e6864e72
am: 2e0d9a13e6

Change-Id: I7d6a1cccb53ba0df106140676fe5d82f613b5a33