Merge "Remove more bogus <stdbool.h> #includes from C++." am: e7020dc8e4 am: c104e3abaf
am: a2e98bdf92

Change-Id: I8f108dfc6a8bdcbd129d6adc90e2b6cc9a7eddae