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

Change-Id: Iac23634992ad0014dbc558dbf1f3beb0354403eb