Merge commit '85dc40d2' into gingerbread-plus-aosp * commit '85dc40d2': Take another tilt at the "--core-library" messaging windmill.