dlx: Updates for speakerphone

Change-Id: I4f666e0b4ab709b22636bc8bf00d2e3b76735128
Update eri.xml
Add ChameleonOS setting file
Add ChameleonOS setting file 2
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1

Conflicts:
	overlay/frameworks/base/core/res/res/xml/eri.xml
overlay:change eri.xml from stock rom
add thermald_boot.conf/pnp.xml for thermald/pnpmgr