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

Change-Id: Iff63b46470d156451346376a573cc56ad5f00670