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

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