am e05806cc: Merge change 4057 into donut

Merge commit 'e05806cc152dfa88917ca61843d784bdd34c91ae'

* commit 'e05806cc152dfa88917ca61843d784bdd34c91ae':
  make applypatch into a static library