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

Change-Id: I4060c75001e6d7418ba2b3c71a9e830681a0487b