Compile with 4.8.3 so far

Change-Id: Ic71029a476c870d03a740beadbc28833a03f416f
Signed-off-by: kecinzer <kecinzer@gmail.com>