[automerger skipped] Merge "Rename data/pkg_staging to data/app-staging." am: ff3c13f52f am: a5589e817b
am: ddd3932823 -s ours
am skip reason: change_id Ic5729d60046e8825a2a94e3c3483ea8232a69ed2 with SHA1 ad0b2473dc is in history

Change-Id: I4257afb668d77d0afac960790f65ea920a92151e