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

Change-Id: If6229437e940d02d61034cb326f9dcdfd12638b1