Merge "Update bionic headers to 9dbfd8ad7."
am: d89dea2f0d

Change-Id: I12ce3ab901a587e12547456373fbaa0993074c92