Merge "Fix mtpd to build with both old and uapi headers."