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

Change-Id: Ie2e1fbe9bb114a3fa32827a79b751b27f86236f7