Revert "Rework on RIL.(Sorry for Camera changes :p )"

This reverts commit 162c4e81f0b131f918eb2a3fef059c83b55f7f72.
Testing..

Change-Id: I51c80b439350b529086fe04f43147df5ebc4dc90