Also fix some whitespace problems and line endings Change-Id: Ibb2b062f02b7dbeee601220b71a741dedfc2e329