Merge commit 'c9410082453abfb6eaaf43e6c97e04711d0751c0' into eclair-plus-aosp * commit 'c9410082453abfb6eaaf43e6c97e04711d0751c0': libcopybit: Fix typo, and the build