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

Change-Id: I774ac98004a2e10bf5cf0cdc7a831429f121bae4