Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread