Correct errors in mergeAndroid.py.

1. Error in __hasDiff, by which repo which has no specific branch will not be copied.
2. Add --exclude parameter.