apr + apr-util: merge from poky