Merge "copy first level apk dir on movePackage"