Merge "Update bionic headers to c816e9f." am: 625fa539e4 am: 0a81f7979d
am: a0b165ebb3

Change-Id: Ifddccdf530a4fcf66590d0bc523a763799e06b2f