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

Change-Id: Id6d8569019d9a34510507a777352847bc1c30dc0