Returning to AOSP build files.