Android 5.1.1 release 4
Merge "Fix mtpd to build with both old and uapi headers."