Update #3897: Refactor missed protected constructors
Update #3897: Refactor missed protected constructors
Fix Android.mk s
Fix small issues
Refactor FileUtils
Refactor FileUtils