[automerger skipped] Merge "Rename data/pkg_staging to data/app-staging" am: aac8abab9d am: 11a29880f3
am: cd4adb6b27 -s ours
am skip reason: change_id I73367a60c23ca17d0557253bea25279c104e1e53 with SHA1 671b42d624 is in history

Change-Id: I5b61235f4f3c41662107bc3729be0eee768e41e2