modified files for aosp build