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