Android l-preview release 2
Merge "Fix mtpd to build with both old and uapi headers."