Improve mergeupstream

- upstream: .config file can contain multiple github instances, fetch androidarmv6
- mergeupstream: Don't show repo sync & abandon messages

Change-Id: I222c94de1cd0efe2edc13ef7ed61eb217fbab7e4