Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49
am: e801810553

Change-Id: I636c0f021c6ffae4518d889b1e7c4c3c29c6e864