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

Change-Id: I148d0e409d726a20379c119294bcf69feac54c8a