am 12a6e13a: am 438b9164: Merge "Removing dalvik/hit, replaced by tools/base/perflib"

* commit '12a6e13a9fedf9426eaae44ce32729717f202aab':
  Removing dalvik/hit, replaced by tools/base/perflib