Android 5.1.0 release 3
Merge "Fix mtpd to build with both old and uapi headers."