added modified files for aosp build