Clear build error with Linaro 4.8

Change-Id: Ib5322c5b8c634c9d8ff8dbfb8e71fd8871a5aaf1
Merge branch 'lp5.0' of git://github.com/reS28raM/frameworks_av into lp5.0