Android CTS 5.1 Release 22 (4181931)
Merge "Fix mtpd to build with both old and uapi headers."