Merge "Remove aprof support from the build system."