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

Change-Id: I9b0504a6bad0bd35ec1e12d070be65e6440f6cf7