am d5a7c371: am 408b3acf: Merge "Add corkscrew support for finding static symbols."

* commit 'd5a7c371d22ea327be03bfa10944e5f0f2d51a24':
  Add corkscrew support for finding static symbols.