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

Change-Id: I4e63493ec05eb92fbcce6c7ed446a9f08a29bd88