Merge "Move SDK files to froyo."