Merge "Update bionic headers to a1fa52292."
am: e15d893bf2

Change-Id: Id8d7fa698d77afb6be82e1b7ae825ae58aee9b68