Merge "Assume bionic has up-to-date linux/capability.h"