Merge commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f' into gingerbread-plus-aosp * commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f': Fix build.
Merge commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f' into gingerbread-plus-aosp * commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f': Fix build.