Revert "Rename two targets to have SettingsLib prefix"

This reverts commit 2f7fd418f61560eb182fa679d570cdc78a871c5d.

Reason for revert: broke settings presubmit

Change-Id: I3c72ea8949c5a4df858f3dfc2a931786cad4cb83
8 files changed