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

Change-Id: I688f772472be7a7d7da9bc5942d956de55dc6d98