Merge to AOSP

[niedzielski]

This fork is super useful, adding new features and significantly improving on functionality in the original upstream ADB. It would be wonderful if these changes were merged back to the source so it's trivial to download via the SDK manager. Although it is not an explicit goal of this project, merging upstream is a written objective for the Facebook ProGuard fork:

The goal of this fork is to remain bit-for-bit compatible with upstream, and to ideally get these patches into upstream proguard.

This ticket is to request that changes in this fork be merged back to AOSP so all users may benefit.