Revert "For debugging"

This causes device build.prop error and unable to build. Please resolve the error before commiting.

This reverts commit c7c659bb6c4576dd352ab93eadbe650a5b3efe13.