Update tools/merge.sh

Updated for Jellybean 4.2