changed aosp folder stuff.