Add script to merge upstream package

Test: ojluni_merge_package java.util.concurrent.atomic
Test: ojluni_cleanup_merge_branches
Change-Id: I2dfdd53b389113b71c8f8a240bbeb8e791e3ccfa
4 files changed