Merge "Moves merge scripts into a new merge folder." am: 51005914bd

Original change: https://android-review.googlesource.com/c/platform/build/+/2006512

Change-Id: I20a06111e7634a39c12f3358ea1c919ae72faf31