Include the directory names in the "ids" to make them unique

There are lots of files with the same name, especially in an app
bundle that includes help in multiple languages.

Change-Id: I66cd2e3c3f22d681d88d02da6fd48ab9651c6f67
Use different CFBundleSignature than upstream

CFBundleSignature is an obsolete concept anyway, it is fine to use
'????' apparently.

Change-Id: Ifc16e834739a5d7ee5fc5d99a3e3469f2aafa0ee