minimize forking

Change-Id: I7b3d7528da80bdf4e5a97e7968f037aa58b222bb
update to 4.2.2

Change-Id: Ic7ae274c7d83aa5a51e1c0b4e28b1a8fa7615764
switch to staging in android_frameworks_opt_telephony

Change-Id: I519f16367104bce3f4c5cfbe2d6ef76bc1e3fd9b