Merge "installd: Account for empty  obb contents on migration" into qt-dev am: a92f294522
am: a91e361dc6

Change-Id: I1f5435e5f5ea561d15d0b389184066252a71c73d