am ae9dc40d: am eda13282: Merge changes I1998a9d6,I2513f0de

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