Merge "Use -Werror in device/linaro/hikey" am: be188a852e am: 082a0a936c
am: 5de1c20b38

Change-Id: I4ca48423c2da450946f323ac7add7e2accbf6be8