Merge pull request #184 from Seinlin/bug-1015827-v1.4

Bug 1015827 v1.4
Merge pull request #182 from viralwang/bug1000581

Bug 1000581 - remove rilproxy for flame
Conflicts:
	base-caf-jb.xml
Fix a typo in manifest. r=mwu

Change-Id: Iddb865f25de966a3c36e33aee02ffc29ca9a8cb4