Merge pull request #25 from hsinyi/bugzilla/845174/master

Bug 845174 - B2G emulator: support RIL_UNSOL_CALL_RING. r=vicamo
Bug 896920 - B2G Emulator: support conference call. r=vicamo