Merge "Use -Werror in device/linaro/hikey"
am: be188a852e

Change-Id: Ie12d771f6c2a531de875b9f7f394306df7af93bc