am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1

* commit '3af8b699830bb5804f3c1b6420d9210b2fd8adb9':
  add a self instrumentation into framework perf app