Merge "Use -Werror in hardware/ril/librilutils" am: d5ee11ddc9
am: a46c52ee4d

Change-Id: I8702779387c84370ea9a46d3fd518b62bfe82dc8