am 7a0b43b9: am 22669b72: Merge "Add missing includes."

* commit '7a0b43b908ed6fd77c22ca4506b7b1d008747bf9':
  Add missing includes.