am efb4bb78: am fd7a9f79: am 66d32c74: Merge "Use CAP_MASK_LONG for file capabilities."

* commit 'efb4bb78208939a89b8cc5316a2f55b903b38eb8':
  Use CAP_MASK_LONG for file capabilities.