Revert "case 2: merging settings from CM is no longer a good idea"

Dev tools doesn't have a launcher.
Why is this a problem?

This reverts commit be7f06f8b939fb30a6e71946ed6ab10da44c0ef3.

Change-Id: I358f8daae39bfb5a870bd53faef0d7297ba1e61e
Merge "Revert "case 2: merging settings from CM is no longer a good idea"" into kk44