Merge commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8' into froyo-plus-aosp * commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8': Fix SDK build.
Merge commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8' into froyo-plus-aosp * commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8': Fix SDK build.