Merge "Rename data/staging to data/pkg_staging."
am: e8510cec19

Change-Id: I60f89ba514adb7336c21660a463c8eb50849affe