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