Merge "Use -Werror in development/tools/line_endings" am: f1ce8d402c
am: e8c304609b

Change-Id: I90ce6c37a23a059e2510cf7cdc46654c9456e5cc