Android CTS 5.1 release 7
Merge "Fix mtpd to build with both old and uapi headers."