revert build to AOSP, one file at a time

Change-Id: I56ee62038f51af680df278b7db16ba95f058e5cc