Merge "Move to framework-doc-stubs module for versions xml and annotations"