Merge "Update bionic headers to 42eb0b2." am: 9e60c0a9f3
am: fa135ebb1a

Change-Id: Ia6a0e0e2a1d8276583bf3d645fd1fa1bfe2cea73