Fix "adb backup -shared" am: 60af594c3e am: f300d9760b
am: 0ddcc58272

Change-Id: I8f291b75698c4acbfc667ce227a1e95e5b2aa50a