Fix post-merge problems.
treeb751ce5e7636c679caeb55b36c24eb38f782378d
drwxr-xr-x - apps
drwxr-xr-x - backdrops
drwxr-xr-x - bootloader
drwxr-xr-x - docs
drwxr-xr-x - firmware
drwxr-xr-x - flash
drwxr-xr-x - fonts
drwxr-xr-x - gdb
drwxr-xr-x - icons
drwxr-xr-x - manual
drwxr-xr-x - rbutil
drwxr-xr-x - tools
drwxr-xr-x - uisimulator
drwxr-xr-x - utils
drwxr-xr-x - wps