Revert "Code clean"

This reverts commit 06045bdc7fb377e19bb7699c6ccd9e35e9542c33.
Revert "Add Android-Validator submodule"

This reverts commit 9498e961b3a2c88976527c51f2df50ef8cca0598.