Make it work for build on original AOSP on Native Ubuntu
- Clean up unused files
- Code style clean up