am 1069fcdf: am d41722ce: Merge "Fix build issues with external patch."

* commit '1069fcdfb74927ae2403dae05ea3a33d17827ae9':
  Fix build issues with external patch.