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

Change-Id: I4e1cfb2241a05a3bc894252fda5a341e4bd91270