Merge "Update bionic headers to 9dbfd8ad7." am: d89dea2f0d am: 4d230e6e5a
am: 2807fa99bd

Change-Id: If0d7b3f7bca6f0d9658f73c850c33ad22dcdfe20