b65fd4726c
Merge commit 'b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp * commit 'b6264a8795ed9469c80727123e3cafda1b07eda3': Fix the build.