Merge "add a self instrumentation into framework perf app" into ics-mr1