Merge "Add cleaned headers for ion to bionic"