[automerger skipped] Merge "Rename data/staging to data/pkg_staging." am: e8510cec19 am: 9f6ba484d0
am: 6033f497d7 -s ours
am skip reason: change_id I878ee41f804956ee7533d64e844ce98e5a8afacc with SHA1 ac1eeb7f78 is in history

Change-Id: I4e411fbe61a50306a9bbb47c21d0264caaaf64e4