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

Change-Id: Id9a8ae202d8bc5656a76bf943533f7c28022dcc4