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

Change-Id: I0aa666366c71c7bfa92c77085f149094bfe0b8a7