fix songo rcmodel
[library] add flash info.
[library] more flash info.
rename getOEM to getBrandOEM
missed one
Revert "missed one"

This reverts commit 798b27147add0d7e81c53f2b7f4e70de6894345e.
getOEM to getBrandOEM
Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure.ac