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

Change-Id: I5d9302227fc3a83f5a11522971396a69cdbe14a2