Android l-preview release 2
Merge "libwebp modules should depend on their makefile"