AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #1640225)
  Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143880
2 files changed