Merge "encoder: Fix warnings in host build"
am: 9046ac2182

Change-Id: I30b498b2cd57d1d63e66e8367f8703c0a8add6e2