Merge "Fix "adb backup -shared"" into nyc-mr1-dev