Bug 1017206: Update SDK to 2.2.5 rs=me