\r\n to \n
Merge branch 'master' of /home/reddy/MerriiLinux

Conflicts:
	build_dragonboard.sh
Merge branch 'master' of /home/reddy/MerriiLinux
Myerge branch 'master' of /home/reddy/MerriiLinux
Myerge branch 'master' of /home/reddy/MerriiLinux
fuck
test1
add lost file