Fix build for AOSP/L

BZ: 209178

Change-Id: Ie613d65660cf3c403f6eb31120ac21f27efdb63e
Signed-off-by: Thierry Strudel <thierry.strudel@intel.com>
Reviewed-on: https://android.intel.com/218248
Reviewed-by: Imberton, Guilhem <guilhem.imberton@intel.com>
Tested-by: Imberton, Guilhem <guilhem.imberton@intel.com>
15 files changed