Merge "Assume bionic has up-to-date linux/capability.h"
am: 1445c4b932

Change-Id: I01c990451aea493b92689478d6748465f8bd0ac8