Merge "Move to framework-doc-stubs module for versions xml and annotations" am: 73870d9f09

Change-Id: Iada2c3022bde0fc126f47b3875dd2abdf16fcc92