Fixing conflict from merge.

Adding both the screenOrientation and asset_dirs options to
settings-local.