Merge pull request #182 from viralwang/bug1000581

Bug 1000581 - remove rilproxy for flame
Conflicts:
	base-caf-jb.xml