Merge "<stdbool.h> not necessary in C++."
am: 390c1a849e

Change-Id: I6650c34ff30aeec00dd28396f7fbe5ed3eb9c5c9