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

Change-Id: Ifea950f6fd40fd0085fa8723b478bcbbae6cdbfc