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

Change-Id: I61bfef435abdd0d6bca56d65b7002578340e33c5