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

Change-Id: I1433782d0613f743143add8538ec30b248d3c696