Merge "Fix unused result errors in bionic."