Merge "Put app image objects in HPROF_HEAP_APP instead of HPROF_HEAP_IMAGE"