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

Change-Id: I561a0b1e25aa06cba5711d065ea69320c6aa0fc6