Merge "Adjust for changes to libcore/Docs.mk" am: f5e3398596
am: c08debc23a

* commit 'c08debc23ab0dfa38cab168f4c631b15b2b17d64':
  Adjust for changes to libcore/Docs.mk