Merge "Rename data/pkg_staging to data/app-staging." am: ff3c13f52f
am: a5589e817b

Change-Id: I947b13e44dd1a3cf77c07b6d57f117e7bb438cf5