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

* commit 'd41722ce05351cebd6ff498d762f74a4aea6b1be':
  Fix build issues with external patch.