Merge "Remove ion.h from bionic uapi headers."