Merge "Remove the now-unnecessary android_mallopt() options."