Merge "Remove unused bionic include."
am: 87025d5658

Change-Id: I9d928d78169403452f5af79800f4135231c053d7