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

Change-Id: Ia500b0645815db9291e5d0546d2ade3f43a1069a