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

Change-Id: I72dfc0184585e27d06cb66a70a16c20c7e36f2bd