[automerger skipped] Merge "Rename data/pkg_staging to data/app-staging" am: 4308cc478d am: fca4a38c18
am: a0d8e7dfd3 -s ours
am skip reason: change_id Id98ecbad4f9452bc40a628ceb8c50ce20453d7ad with SHA1 950d5b4b8a is in history

Change-Id: I056287ae7e54c2facf29d11a12d01019566e1e4b