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