Bug 869327 - B2G Emulator: Upgrade hardware/ril, external/qemu to include RILv7/CDMA

Please see [bug 869327 comment #2](https://bugzilla.mozilla.org/show_bug.cgi?id=869327#c2).

Below are detailed information for this pull request:
1. Merge 'next/jb-mr1.1-release' branch.
2. Revert [bug 848228](https://bugzilla.mozilla.org/show_bug.cgi?id=848228).
3. Merge remote-tracking branch 'aosp/jb-mr1-release'.