Android 4.2.1_r1.2: Back to the Future

Change-Id: I923993553ef014ce2d5a17efe9097b46da59f464