Merge "Fix "adb backup -shared"" into nyc-mr1-dev am: b3690ccf2c am: eee2608e71
am: 6ec8474f94

Change-Id: I7b07cbe9316e231e7a24d6e98ac62be19970e20f