Android mainline 11.0.0 release 4
Merge "Fix webp build to avoid linking errors when building on mac" am: 274be04ff7 am: c15a3524ca am: 65a144b939

Change-Id: Ib72e3aa9b93fbe0e155ad16479214deeed47da73