am eda13282: Merge changes I1998a9d6,I2513f0de

* commit 'eda132820bede79a109c16aa0c91bd6cb15380d8':
  Function to grep AndroidManifest.xml files.
  Utility to dump stacks from arbitrary processes.