cherries.sh: Update merged & missing cherries

Change-Id: Ib7a55edc155447a6172f7f6e83e41799a95a7c49