Merge "Update bionic headers to 59a3439." am: aa65f1136c
am: e35b526612

Change-Id: I9a870c9b8eb8bd938d0338f2ff5b3d5da5f55a62