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

Change-Id: I5cb6df212014e3c9c07ca80c44c9d084649b66bd