Android CTS 5.0 Release 8 (2991207)
Merge "Fix mtpd to build with both old and uapi headers."