Merge "external/libwebp: cherry-pick scaler & lossless fixes" am: 11df2fac48 am: 947a265bdd
am: b6b35fed2b

Change-Id: I15a02d53bb69d30804148e31450054d968c8ef93