*** BACK TO NON-LEGACY FRAMEWORKS/OPT/TELEPHONY. IF THIS BREAKS THINGS, WILL REVERT QCRIL ACCROSS THE BOARD ***

Change-Id: I35869cdd92b6a52a99a568cdecf7bae7f49c209d