Merge "Adjust for changes to libcore/Docs.mk"