Merge "Fix comment to indicate android_mallopt is also available to APEXes."