PackageUtil enhanced to work on Android