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