Revert "fix NoClassDefFoundError"

This reverts commit cac12daf4031abfa97e6978fb431060ac32a0645.

Change-Id: I9a8f74b325efb870a56de65d2d25166647f9c5b9
Merge "Revert "fix NoClassDefFoundError"" into jellybean
remove cloud control from settings provider

Change-Id: I7455c8840d0a24989b52337d11e9c5cad7e1eb74