Merge "Put app image objects in HPROF_HEAP_APP instead of HPROF_HEAP_IMAGE"
am: bc51fd08e8

Change-Id: I73b339fb8d59bf42ece3e6156beab49b6e91d358