Merge change 20154

* changes:
  Added defines for <stdint.h> and <stdbool.h>.