AOSP cleanup: remove warnings and build errors for AOSP/L

BZ: 209178

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