Merge "Add support for profiling boot class path" am: 9533cc0a37
am: 7c8cbf3d28

Change-Id: I3ea3af951d9ce7eebcd87b32a398b7c25e30bba4