Merge "Makes adb install -r the default behavior"