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