Merge "Rename data/pkg_staging to data/app-staging"
am: 4308cc478d

Change-Id: I3c1bfc034350839336395086504f513cd8a71002