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

Change-Id: If54b3269c296fdb72dc90bb84f8ec2d0de42a874