Revert "Update MobileFrontend for cherry-picks"

This reverts commit 70f5ab2414d027acbddb6e2eadaa1f69c8bc3f4b.

Change-Id: Ib6bc651031fda14903f173b231cffd4127ccf18a