Merge "Use bionic platform headers."