Clean-up files and make compatible with AOSP