Fix: Rename settings directories to standard

These automatically-generated settings files have the wrong directory
naming convention, leaving off the "-settings" at the end. The
permanent fix for this will be in the INFO merge job, but for now,
these need to be manually fixed.

Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I30d701b550b12b90e8caf18d147526ecf2e5eae0