Merge "<stdbool.h> not necessary in C++." am: 390c1a849e am: f2cfcb12ca am: 234229671c
am: 9cefe1f0e8

Change-Id: Ia3c9a28b3e04b1fd819c329cc2d68fbb8a93a7c7