Change frameworks_base branch back to jellybean