Merge pull request #2392 from don-rumata-vk/libaprutil