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

Change-Id: Ia1da35707e33da6fa2b4a2c23bea14002613a8eb