Merge "Enable jdiff for api-stubs-docs"