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

Change-Id: I606af9209c8c24edda1e619bb0d495ee103395d5