Merge "Compile mux files (v0.6.0) with libwebp-encode target" am: 8a3abc70e4 am: c4d310a75d am: 1783134ed5
am: bf5548a73e

Change-Id: Ic34c882c08220ae92468af66d2bd61690d0d3796